From: Jan D. <jan.h.d@swipnet.se>
Date: Wed, 6 Jan 2010 16:04:19 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8236^2~54
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=269cf0db805913fdebe9ee78138b8e886624af7f;p=emacs.git

Merge from trunk
---

269cf0db805913fdebe9ee78138b8e886624af7f